scale: Avoid a crash
authorMatthias Clasen <mclasen@redhat.com>
Sun, 15 May 2016 18:18:09 +0000 (14:18 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 15 May 2016 18:18:09 +0000 (14:18 -0400)
gtk_scale_get_layout was not careful enough, leading to a crash
when opening the inspector on a scale.

gtk/gtkscale.c

index fc0121de97f7704450d409a03f2bd7c85f76394c..6d71292e14ad0894bc5527a845899a5e4fa10915 100644 (file)
@@ -1901,12 +1901,11 @@ gtk_scale_get_layout (GtkScale *scale)
 
   priv = scale->priv;
 
-  if (!priv->layout)
+  if (!priv->layout && priv->draw_value)
     {
       int min_layout_width;
 
-      if (priv->draw_value)
-        priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
+      priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
 
       gtk_css_gadget_get_preferred_size (priv->value_gadget,
                                          GTK_ORIENTATION_HORIZONTAL, -1,